Merge tag 'upstream/3.002'
authorgregor herrmann <gregoa@debian.org>
Wed, 27 Aug 2014 02:35:28 +0000 (19:35 -0700)
committergregor herrmann <gregoa@debian.org>
Wed, 27 Aug 2014 02:35:28 +0000 (19:35 -0700)
commit2085c886fe8189cdc863cabba94a667f7f5fd000
treed3be47dd91220d5226773e7dcf284701647fdc18
parent7622d6f2eda4f6c9836f82a06adaa7f894bb128d
parentba0ad854628d78f359ef76be2ae0b2bd3f089c83
Merge tag 'upstream/3.002'

Upstream version 3.002